Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SYL-3329 Add support for Sylius 1.13 #287

Merged
merged 32 commits into from
Apr 8, 2024
Merged

Conversation

mpysiak
Copy link
Member

@mpysiak mpysiak commented Mar 20, 2024

  • Fix 1.13
  • Update composer.json, add ecs check
  • Limit builds
  • Add support for node 20
  • Add state machine config, add migrations for postgresql
Q A
Branch? 1.5
Bug fix? no
New feature? no
Related tickets

Rafikooo and others added 14 commits January 18, 2024 12:55
This PR was merged into the 1.5 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | master
| Bug fix?        | no
| New feature?    | no
| Related tickets | Sylius/Sylius#15582


Commits
-------
  [Composer] Remove Psalm
  [Psalm] Remove configuration file
  [Psalm] Remove outdated annotations
This PR was merged into the 1.5 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | 1.5
| Bug fix?        | yes
| New feature?    | no
| Related tickets | replace Sylius#249

If the order already has a payment in the "new" status, then the Sylius orderPaymentProcessor must not be processed, otherwise a new payment in the "cart" status will be created, which will cause errors (2 payments in order ...).

Before : 
![image](https://user-images.githubusercontent.com/6593252/215053880-97319618-b24e-4a10-8281-15b71d494912.png)

After :
![image](https://user-images.githubusercontent.com/6593252/215054517-63061d73-37d3-4644-b16c-f57867a7e7d0.png)


Commits
-------

e068f7c fix cancel payment
… version of `symfony/flex` to `^2.4` (Rafikooo)

This PR was merged into the 1.5 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | 1.5
| Bug fix?        | yes
| New feature?    | no
| Related tickets | Sylius/Sylius-Standard#945

Both changes were interdependent, so I propose to combine them into one PR to achieve the green build

Commits
-------

7347d95 [Conflict] Add conflict with behat/mink-selenium2-driver:>=1.7.0
bea2505 [CI] Bump version of symfony/flex to ^2.4
@mpysiak mpysiak marked this pull request as ready for review March 20, 2024 07:23
.github/workflows/build.yml Outdated Show resolved Hide resolved
src/Api/WebhookApi.php Outdated Show resolved Hide resolved
tests/Application/config/packages/test/framework.yaml Outdated Show resolved Hide resolved
@mpysiak mpysiak changed the base branch from 1.5 to master March 26, 2024 08:13
@mpysiak mpysiak force-pushed the fix/1.13 branch 3 times, most recently from 4ed29ba to 125bb0c Compare March 26, 2024 11:22
src/Listener/PayPalOrderCompletedListener.php Outdated Show resolved Hide resolved
src/Listener/PayPalPaymentRefundedListener.php Outdated Show resolved Hide resolved
tests/Application/composer.lock Outdated Show resolved Hide resolved
src/Controller/CreatePayPalOrderAction.php Outdated Show resolved Hide resolved
UPGRADE.md Show resolved Hide resolved
UPGRADE.md Outdated Show resolved Hide resolved
UPGRADE.md Outdated Show resolved Hide resolved
UPGRADE.md Outdated Show resolved Hide resolved
spec/Api/GenericApiSpec.php Show resolved Hide resolved
src/Api/WebhookApi.php Outdated Show resolved Hide resolved
src/Client/PayPalClient.php Outdated Show resolved Hide resolved
src/Listener/CompletePayPalOrderListener.php Outdated Show resolved Hide resolved
src/Resources/config/services/api.xml Show resolved Hide resolved
tests/Application/config/packages/workflow.yaml Outdated Show resolved Hide resolved
@mpysiak mpysiak force-pushed the fix/1.13 branch 3 times, most recently from afd5785 to f99bdad Compare April 3, 2024 10:36
@mpysiak mpysiak requested review from GSadee and Wojdylak April 4, 2024 11:48
Copy link
Contributor

@NoResponseMate NoResponseMate left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A bunch of my comments will probably go away when you update the ecs config and rerun it, so start with that 👋

UPGRADE.md Show resolved Hide resolved
UPGRADE.md Show resolved Hide resolved
UPGRADE.md Outdated Show resolved Hide resolved
UPGRADE.md Show resolved Hide resolved
ecs.php Outdated Show resolved Hide resolved
src/EventListener/Workflow/CompletePayPalOrderListener.php Outdated Show resolved Hide resolved
src/Entity/PayPalCredentials.php Outdated Show resolved Hide resolved
tests/Application/composer.json Show resolved Hide resolved
tests/Application/config/bundles.php Outdated Show resolved Hide resolved
src/Controller/CreatePayPalOrderFromPaymentPageAction.php Outdated Show resolved Hide resolved
@mpysiak mpysiak force-pushed the fix/1.13 branch 4 times, most recently from 09ba67f to c378760 Compare April 5, 2024 06:10
@GSadee GSadee merged commit 1104ba9 into Sylius:master Apr 8, 2024
14 checks passed
@GSadee
Copy link
Member

GSadee commented Apr 8, 2024

Thank you, Michał! 🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants